Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 14 Jan 2010 11:42:38 +0000 (11:42 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 14 Jan 2010 11:42:38 +0000 (11:42 +0000)

Trivial merge